Autogenerated HTML docs for v1.5.4.1-34-g94bf 
diff --git a/config.txt b/config.txt index 4e222f1..3e10feb 100644 --- a/config.txt +++ b/config.txt 
@@ -766,6 +766,12 @@ 	whenever the corresponding pack is larger than 2 GB. Otherwise 	the default is 1.   +pack.packSizeLimit: +	The default maximum size of a pack. This setting only affects +	packing to a file, i.e. the git:// protocol is unaffected. It +	can be overridden by the `\--max-pack-size` option of +	linkgit:git-repack[1]. +  pull.octopus:: 	The default merge strategy to use when pulling multiple branches 	at once.